Merge remote-tracking branch 'origin/uiUptate0629' into testNew

src/css/cdss.less

@@ -215,6 +215,10 @@ body{
     position: relative;
     /*display: inline-block;*/
 }
+.warning .pushItemName .item-name{
+  opacity: .8;
+  filter:alpha(opacity=80);
+}
 .pushItemName{
     position: relative;
     display: inline-block;
@@ -377,6 +381,7 @@ body{
 .warningTitle{
     position: relative;
     margin-right: 15px;
+  font-weight: bold;
 }
 .medicalKonwledgeWrap{
 
@@ -443,6 +448,7 @@ body{
 .tips-cont{
   border-radius: 8px;
   box-shadow: 0px 5px 5px 0px @shadowColor;
+  border-bottom: 1px #D8D8D8 solid \9;
   .moduleBoxTitle{
     border-color: #FF8042;
   }

src/css/cdssHorizontal.less

@@ -236,7 +236,7 @@
     position: absolute;
     top: 0;
     font-size: 14px;
-    font-weight: 600;
+    /*font-weight: 600;*/
     color: @colorWaring;
   }
 }

src/js/followUp.js

@@ -32,7 +32,7 @@ function renderPage(data, type) {
     renderName(operaItemName)
     if (type) {
         operaItemDetail = operaItemDetail.filter((it)=>it.history===0)||[];
-        operaItemDetail.length=1;
+        operaItemDetail.length=operaItemDetail.length>0?1:0;
         renderDetailHorizontal(operaItemDetail)
     } else {
         renderBtn(operaItemDetail)