merge from 'origin'

src/css/common.less

@@ -0,0 +1,8 @@
+@grayColor:#D1D1D1; //边框
+@bgcBlue:#ECF4FC; //背景蓝色
+@colorBlue:#267FD7;  //hover
+@bgcWaring:#FDF4EE; //病情提示
+@colorWaring:#FF545B; //警惕
+@bgcPlan:#E3FEFE; //治疗
+@bgcMay:#FAEBEC; //疑似，警惕，可能
+@bgcModal:#DFEAFE; //弹窗头

src/css/index.less

@@ -1,11 +1,18 @@
+@import './common.less';
+
 .iframeWrap {
   margin: 10px auto 50px;
   padding: 20px;
   overflow: auto;
-  max-width: 800px;
+  max-width: 400px;
   .conditionHintPub {
     border: 1px solid #F2F2F2;
     margin-bottom: 15px;
+    li {
+      padding-right: 18px;
+      float: left;
+      line-height: 24px;
+    }
     .conditionMain {
       padding: 17px;
     }
@@ -19,7 +26,7 @@
         line-height: 28px;
         .makesureResult {
           cursor: pointer;
-          color: #267FD7;
+          color: @colorBlue;
         }
         .sanjiao {
           width: 18px;
@@ -37,7 +44,7 @@
     }
     .treatPlanWrap {
       padding-bottom: 10px;
-      border-bottom: 1px solid #D8D8D8;
+      border-bottom: 1px solid @grayColor;
     }
     .treatMedicine {
       padding-top: 10px;
@@ -46,7 +53,7 @@
         position: relative;
       }
       .medicine {
-        border-bottom: 1px solid #b6b6b6;
+        border-bottom: 1px solid @grayColor;
         position: relative;
         cursor: pointer;
         a {
@@ -64,14 +71,14 @@
         }
       }
       .medicine:hover {
-        color: #267FD7;
+        color: @colorBlue;
         a {
           display: inline-block;
         }
       }
       .medicineDis {
-        color: #b6b6b6;
-        border-bottom: 1px solid #b6b6b6;
+        color: @grayColor;
+        border-bottom: 1px solid @grayColor;
       }
       .medicineWaring {
         background-color: #f4c051;
@@ -83,11 +90,11 @@
       }
       .medicineWaringDis {
         background-color: #fff;
-        color: #b6b6b6;
+        color: @grayColor;
         font-size: 12px;
         border-radius: 4px;
         line-height: 18px;
-        border: 1px solid #b6b6b6;
+        border: 1px solid @grayColor;
       }
     }
     p {
@@ -98,45 +105,24 @@
     }
   }
   .conditionHintWz{
-    ul {
-      li {
-        float: left;
-        padding: 0 8px;
-        line-height: 24px;
-      }
-    }
     h4 {
-      background-color: #ECF4FC;
+      background-color: @bgcBlue;
       i {
         background: url("../images/inquire.png") center center no-repeat;
       }
     }
   }
   .conditionHintTg{
-    ul {
-      li {
-        float: left;
-        padding: 0 8px;
-        line-height: 24px;
-      }
-    }
     h4 {
-      background-color: #ECF4FC;
+      background-color: @bgcBlue;
       i {
         background: url("../images/tgjc.png") center center no-repeat;
       }
     }
   }
   .conditionHintInspect{
-    ul {
-      li {
-        float: left;
-        padding: 0 8px;
-        line-height: 24px;
-      }
-    }
     h4 {
-      background-color: #ECF4FC;
+      background-color: @bgcBlue;
       i {
         background: url("../images/inspect.png") center center no-repeat;
       }
@@ -144,6 +130,7 @@
   }
   .conditionHintMay{
     h4 {
+      background-color: @bgcMay;
       i {
         background: url("../images/yszd.png") center center no-repeat;
       }
@@ -152,24 +139,17 @@
   .conditionHintWarings{
     display: none;
     h4 {
-      color: #FF545B;
+      color: @colorWaring;
       i {
         background: url("../images/warings.png") center center no-repeat;
       }
     }
     li{
       float: left;
-      padding: 0 8px;
       line-height: 24px;
-      a {
-        display: inline-block;
-      }
     }
     li:hover {
-      color: #267FD7;
-      a {
-        color: #267FD7;
-      }
+      color: @colorBlue;
     }
   }
   .conditionHintKnzd{
@@ -182,21 +162,16 @@
     ul {
       li {
         float: left;
-        padding: 0 8px;
         line-height: 24px;
       }
       li:hover {
-        color: #267FD7;
-        a {
-          color: #267FD7;
-          display: inline-block;
-        }
+        color: @colorBlue;
       }
     }
   }
   .conditionHintZhiliao{
     h4 {
-      background-color: #E3FEFE;
+      background-color: @bgcPlan;
       i {
         background: url("../images/zhiliao.png") center center no-repeat;
       }
@@ -206,18 +181,18 @@
     .mayIllness {
       padding-bottom: 5px;
       a {
-        border-bottom: 1px solid #b6b6b6;
+        border-bottom: 1px solid @grayColor;
       }
     }
     h4 {
-      background-color: #FDF4EE;
+      background-color: @bgcWaring;
       i {
         background: url("../images/tips.png") center center no-repeat;
       }
     }
   }
   .illnessTable {
-    color: #267FD7;
+    color: @colorBlue;
     line-height: 28px;
   }
   .conditionHint{
@@ -226,7 +201,7 @@
     color: #000;
     height: 40px;
     line-height: 40px;
-    background-color: #FDF4EE;
+    background-color: @bgcMay;
     font-size: 16px;
     font-weight: bold;
   }
@@ -244,19 +219,19 @@
   position: relative;
 }
 .conditionHintInspectNull {
-  border-bottom: 1px solid #D8D8D8;
+  border-bottom: 1px solid @grayColor;
   padding-bottom: 5px;
   margin-bottom: 5px;
 }
 
-.conditionHintInspectNull,.conditionHintAssistNull {
-  padding-left: 8px;
-}
 .conditionHintAssistLis,.conditionHintInspectLis {
   padding: 5px 0;
   .slideDown {
     padding: 5px 0 5px 0px;
   }
+  li:first-child{
+    padding-right: 5px;
+  }
 }
 .commonTreat {
   .slideup {
@@ -276,7 +251,7 @@
   position: absolute;
   top: 0px;
   right: 0px;
-  color: #267FD7;
+  color: @colorBlue;
   height: 25px;
   line-height: 25px;
   box-shadow: -2px 0px 15px 0px #fff;
@@ -296,7 +271,7 @@
   float: right;
   bottom: 0px;
   right: 0px;
-  color: #267FD7;
+  color: @colorBlue;
   cursor: pointer;
   i{
     width: 10px;
@@ -320,8 +295,23 @@
     display: block;
   }
 }
-#receiverIframe {
+.infoMsg {
+  width: 20px;
+  height: 20px;
+  position: absolute;
+  top: 2px;
+  right: 0px;
+  display: none;
+  background: url('../images/msg1.png') center center no-repeat;
+}
+.infoMsg:hover {
+  background: url('../images/msg2.png') center center no-repeat;
+}
+.infoMsgParent {
   position: relative;
-  width: 100%;
-  height: 100%;
+}
+.infoMsgParent:hover {
+  .infoMsg {
+    display: block;
+  }
 }

src/css/popup.less

@@ -1,3 +1,5 @@
+@import './common.less';
+
 .popupModal {
   position: absolute;
   top: 24px;
@@ -29,7 +31,7 @@
     height: 30px;
     line-height: 30px;
     margin: 0 20px;
-    border-bottom: 1px solid #b6b6b6;
+    border-bottom: 1px solid @grayColor;
     ul {
       display: inline-block;
     }
@@ -64,7 +66,7 @@
   .modalMainTwo {
     padding: 20px 0;
     margin: 0 20px;
-    border-bottom: 1px solid #b6b6b6;
+    border-bottom: 1px solid @grayColor;
     .radioCheck {
       height: 30px;
       line-height: 30px;

src/css/reset.css

@@ -79,4 +79,5 @@ textarea {
 
 .clearfix {
   zoom: 1; 
-}
+}
+

src/index.js

@@ -86,7 +86,7 @@ post(config.pushInner,msg).then((res)=>{
     }
     if(result.pacs.length > 0 && result.lab.length > 0){
       $(".conditionHintAssistLis").css({
-        "border-top":"1px solid #D8D8D8",
+        "border-top":"1px solid #D1D1D1",
         // "margin-top":"5px",
         // "padding-top":"5px"
       })

src/js/indexDom.js

@@ -1,7 +1,6 @@
 function bqtsFun(data){//病情提示
   for(var k = 0;k < data.length;k++){
     var tmpBq = data[k]
-    console.log(tmpBq)
     var tmpBqStr = '<p class="mayIllness">患者可能有<span></span> <a target="_blank" href="information.html?type=22&position=2&questionId='+tmpBq.id+'">'+tmpBq.name+'</a> :</p>'
     var tmpBqDetailStr = ''
     for(var m = 0;m < tmpBq.details.length;m++){
@@ -113,9 +112,8 @@ function cyywFun(data){//常用药物
   }
   $(".treatMedicine").prepend('<p class="treatPlan">常用药物治疗</p>')
   var treatList = $(".treatMedicine").find(".medicinePart")
-  for(var h = 0;h < treatList.length;h++){
-    var commonTreatHeight = $(treatList[h]).height()
-    if(commonTreatHeight > 25){
+  for(var h = 0;h < treatList.length;h++){ 
+    if($(treatList[h]).height() > 25){
       $(treatList[h]).addClass('medicinePartLimitHeight').append('<span class="slideDown">更多 <i></i></span>')
     }
     $(".treatMedicine").on('click',".slideDown",function(){
@@ -133,46 +131,26 @@ function knzdFun(data){//可能诊断
   for(var i = 0;i < data.length;i++){
     $(".conditionHintKnzd").css("display","block")
     if(data[i].id){
-      tmpStr+='<li title="点击该名称可看详细说明"><a target="_blank" href="information.html?type=22&position=2&questionId='+data[i].id+'">'+data[i].name+'</a></li>'
+      tmpStr+='<li class="infoMsgParent"><a title="点击该名称可看详细说明" target="_blank" class="infoMsg" href="information.html?type=22&position=2&questionId='+data[i].id+'"></a>'+data[i].name+'</li>'
     }else{
       tmpStr+='<li>'+data[i].name+'</li>'
     }
   }
   $(".conditionHintKnzdLis").append(tmpStr)
-  if($(".conditionHintKnzdLis").height() > 25){
-    $(".conditionHintKnzdLis").addClass("medicinePartLimitHeight").append('<span class="slideDown">更多 <i></i></span>')
-  }
-  $(".conditionHintKnzdLis").on('click',".slideDown",function(){
-    $(".conditionHintKnzdLis").removeClass("medicinePartLimitHeight").append('<span class="slideup">收起 <i></i></span>')
-    $(this).remove()
-  })
-  $(".conditionHintKnzdLis").on('click',".slideup",function(){
-    $(".conditionHintKnzdLis").addClass("medicinePartLimitHeight").append('<span class="slideDown">更多 <i></i></span>')
-    $(this).remove()
-  })
+  slideToggle($(".conditionHintKnzdLis"))  
 }
 function jtFun(data){
   var tmpStr = ''
   for(var i = 0;i < data.length;i++){
     $(".conditionHintWarings").css("display","block")
     if(data[i].id){
-      tmpStr+='<li title="点击该名称可看详细说明"><a target="_blank" href="information.html?type=22&position=2&questionId='+data[i].id+'">'+data[i].name+'</a></li>'
+      tmpStr+='<li class="infoMsgParent">'+data[i].name+'<a target="_blank" title="点击该名称可看详细说明" class="infoMsg" href="information.html?type=22&position=2&questionId='+data[i].id+'"></a></li>'
     }else{
       tmpStr+='<li>'+data[i].name+'</li>'
     }
   }
   $(".conditionHintWaringsLis").append(tmpStr)
-  if($(".conditionHintWaringsLis").height() > 25){
-    $(".conditionHintWaringsLis").addClass("medicinePartLimitHeight").append('<span class="slideDown">更多 <i></i></span>')
-  }
-  $(".conditionHintWaringsLis").on('click',".slideDown",function(){
-    $(".conditionHintWaringsLis").removeClass("medicinePartLimitHeight").append('<span class="slideup">收起 <i></i></span>')
-    $(this).remove()
-  })
-  $(".conditionHintWaringsLis").on('click',".slideup",function(){
-    $(".conditionHintWaringsLis").addClass("medicinePartLimitHeight").append('<span class="slideDown">更多 <i></i></span>')
-    $(this).remove()
-  })
+  slideToggle($(".conditionHintWaringsLis"))  
 }
 function tjwzFun(data){
   var tmpStr = ''
@@ -180,17 +158,7 @@ function tjwzFun(data){
     tmpStr+='<li>'+data[i].tagName+'</li>'
   }
   $(".conditionHintWzLis").append(tmpStr)
-  if($(".conditionHintWzLis").height() > 25){
-    $(".conditionHintWzLis").addClass("medicinePartLimitHeight").append('<span class="slideDown">更多 <i></i></span>')
-  }
-  $(".conditionHintWzLis").on('click',".slideDown",function(){
-    $(".conditionHintWzLis").removeClass("medicinePartLimitHeight").append('<span class="slideup">收起 <i></i></span>')
-    $(this).remove()
-  })
-  $(".conditionHintWzLis").on('click',".slideup",function(){
-    $(".conditionHintWzLis").addClass("medicinePartLimitHeight").append('<span class="slideDown">更多 <i></i></span>')
-    $(this).remove()
-  })
+  slideToggle($(".conditionHintWzLis"))  
 }
 function tjtgFun(data){
   var tmpStr = ''
@@ -198,17 +166,7 @@ function tjtgFun(data){
     tmpStr+='<li>'+data[i].tagName+'</li>'
   }
   $(".conditionHintTgLis").append(tmpStr)
-  if($(".conditionHintTgLis").height() > 25){
-    $(".conditionHintTgLis").addClass("medicinePartLimitHeight").append('<span class="slideDown">更多 <i></i></span>')
-  }
-  $(".conditionHintTgLis").on('click',".slideDown",function(){
-    $(".conditionHintTgLis").removeClass("medicinePartLimitHeight").append('<span class="slideup">收起 <i></i></span>')
-    $(this).remove()
-  })
-  $(".conditionHintTgLis").on('click',".slideup",function(){
-    $(".conditionHintTgLis").addClass("medicinePartLimitHeight").append('<span class="slideDown">更多 <i></i></span>')
-    $(this).remove()
-  })
+  slideToggle($(".conditionHintTgLis"))  
 }
 function tjhyFun(data){
   var tmpStr = ''
@@ -216,17 +174,7 @@ function tjhyFun(data){
     tmpStr+='<li>'+data[i].tagName+'</li>'
   }
   $(".conditionHintInspectLis").append('<li>化验 <i style="color:#ADADAD">|</i></li>'+tmpStr)
-  if($(".conditionHintInspectLis").height() > 25){
-    $(".conditionHintInspectLis").addClass("medicinePartLimitHeight").append('<span class="slideDown">更多 <i></i></span>')
-  }
-  $(".conditionHintInspectLis").on('click',".slideDown",function(){
-    $(".conditionHintInspectLis").removeClass("medicinePartLimitHeight").append('<span class="slideup">收起 <i></i></span>')
-    $(this).remove()
-  })
-  $(".conditionHintInspectLis").on('click',".slideup",function(){
-    $(".conditionHintInspectLis").addClass("medicinePartLimitHeight").append('<span class="slideDown">更多 <i></i></span>')
-    $(this).remove()
-  })
+  slideToggle($(".conditionHintInspectLis"))
 }
 function tjfjFun(data){
   var tmpStr = ''
@@ -234,15 +182,18 @@ function tjfjFun(data){
     tmpStr+='<li>'+data[i].tagName+'</li>'
   }
   $(".conditionHintAssistLis").append('<li>辅检 <i style="color:#ADADAD">|</i></li>'+tmpStr)
-  if($(".conditionHintAssistLis").height() > 25){
-    $(".conditionHintAssistLis").addClass("medicinePartLimitHeight").append('<span class="slideDown">更多 <i></i></span>')
+  slideToggle($(".conditionHintAssistLis"))
+}
+function slideToggle(domName){//展开收起
+  if(domName.height() > 25){
+    domName.addClass("medicinePartLimitHeight").append('<span class="slideDown">更多 <i></i></span>')
   }
-  $(".conditionHintAssistLis").on('click',".slideDown",function(){
-    $(".conditionHintAssistLis").removeClass("medicinePartLimitHeight").append('<span class="slideup">收起 <i></i></span>')
+  domName.on('click',".slideDown",function(){
+    domName.removeClass("medicinePartLimitHeight").append('<span class="slideup">收起 <i></i></span>')
     $(this).remove()
   })
-  $(".conditionHintAssistLis").on('click',".slideup",function(){
-    $(".conditionHintAssistLis").addClass("medicinePartLimitHeight").append('<span class="slideDown">更多 <i></i></span>')
+  domName.on('click',".slideup",function(){
+    domName.addClass("medicinePartLimitHeight").append('<span class="slideDown">更多 <i></i></span>')
     $(this).remove()
   })
 }

src/js/popup.js

@@ -6,21 +6,15 @@ $(document).on('click',".radioChecks",function(){
   })
   $(this).siblings().attr("data-select","").children("i").css("background","url('../images/sex1.png') center center no-repeat")
 })
-$(document).on('click',".closeModal",function(e){
+$(".conditionHintTips").on('click',".closeModal",function(e){
   e.stopPropagation()
   $(this).parents(".popupModal").css("display","none")
 })
-$(document).on('click',".mayResultSelect",function(){
-  console.log($(this).children(".popupModal").css("display"))
-  if($(this).children(".popupModal").css("display") == 'none'){
-    $(this).children(".popupModal").css('display',"block")
-    $(this).parents(".mayResult").siblings().find(".popupModal").css('display',"none")
-  }else{
-    $(this).children(".popupModal").css('display',"none")
-  }
-  // $(".popupModal").css('display',"none")
+$(".conditionHintTips").on('click',".mayResultSelect",function(){
+  $(".popupModal").css('display',"none")
+  $(this).children(".popupModal").css('display',"block")
 })
-$(document).on('click',".sureScore",function(e){
+$(".conditionHintTips").on('click',".sureScore",function(e){
   e.stopPropagation()
   if($(this).attr("data-type") == 2){
     var tmpVal = $(this).parents(".mayResultSelect").find(".calculateResult:last").html()
@@ -32,7 +26,7 @@ $(document).on('click',".sureScore",function(e){
   }
   $(this).parents(".popupModal").css('display',"none")
 })
-$(document).on('click','.calculate',function(){
+$(".conditionHintTips").on('click','.calculate',function(){
   var that = $(this)
   var numFlg = that.attr("data-num")
   var tmpMoadlData = window.pushMessage[numFlg]